[panel] separate "active" state from hover state in PanelBaseMenuItem

When doing keyboard navigation, the active menu item may not be the
one under the mouse.

https://bugzilla.gnome.org/show_bug.cgi?id=619008

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 3367c576d1a33f33f05901d7f4db387d01bfe8a1..93cb4b3b08b05a158f3e10a913eba6e20f3c172a 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -142,7 +142,7 @@ StTooltip {
     padding: 6px 20px;
 }
 
-.panel-menu-item:hover {
+.panel-menu-item:active {
     background-color: #4c4c4c;
 }
 

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 05c58ef258659f0542db67dff2a2d4f2cc6de4d3..9c311a5e3a3e61e5ebf44bc0771c61f900ff07b5 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -138,11 +138,34 @@ PanelBaseMenuItem.prototype = {
                                   x_fill: true,
                                   y_fill: true,
                                   x_align: St.Align.START });
+        this.active = false;
 
         if (reactive) {
             this.actor.connect('button-release-event', Lang.bind(this, function (actor, event) {
                 this.emit('activate', event);
             }));
+            this.actor.connect('notify::hover', Lang.bind(this, this._hoverChanged));
+        }
+    },
+
+    _hoverChanged: function (actor) {
+        this.setActive(actor.hover);
+    },
+
+    activate: function (event) {
+        this.emit('activate', event);
+    },
+
+    setActive: function (active) {
+        let activeChanged = active != this.active;
+
+        if (activeChanged) {
+            this.active = active;
+            if (active)
+                this.actor.add_style_pseudo_class('active');
+            else
+                this.actor.remove_style_pseudo_class('active');
+            this.emit('active-changed', active);
         }
     }
 };